Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename debians to debs everywhere. (backport #4669) #4670

Merged
merged 2 commits into from
Aug 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 22, 2024

That's because "debians" specifically refers to packages for Debian, while "debs" more generally refers to packages in the .deb format (which describes at least Debian and Ubuntu).

This should fix #4639 .


This is an automatic backport of pull request #4669 done by Mergify.

That's because "debians" specifically refers to packages
for Debian, while "debs" more generally refers to packages
in the .deb format (which describes at least Debian and Ubuntu).

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
(cherry picked from commit 7033cbe)

# Conflicts:
#	source/Installation/Ubuntu-Install-Debs.rst
@mergify mergify bot requested a review from clalancette as a code owner August 22, 2024 07:21
@mergify mergify bot added the conflicts label Aug 22, 2024
@mergify mergify bot requested a review from audrow as a code owner August 22, 2024 07:21
Copy link
Contributor Author

mergify bot commented Aug 22, 2024

Cherry-pick of 7033cbe has failed:

On branch mergify/bp/jazzy/pr-4669
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 7033cbe5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   source/Concepts/Intermediate/About-RQt.rst
	modified:   source/How-To-Guides.rst
	modified:   source/How-To-Guides/Building-ROS-2-with-Tracing.rst
	renamed:    source/How-To-Guides/Building-a-Custom-Debian-Package.rst -> source/How-To-Guides/Building-a-Custom-Deb-Package.rst
	modified:   source/How-To-Guides/Releasing/_Install-Dependencies.rst
	modified:   source/How-To-Guides/Using-ros1_bridge-Jammy-upstream.rst
	modified:   source/Installation.rst
	modified:   source/Installation/Alternatives/Ubuntu-Development-Setup.rst
	modified:   source/Installation/Alternatives/Ubuntu-Install-Binary.rst
	modified:   source/Installation/DDS-Implementations.rst
	modified:   source/Installation/DDS-Implementations/Working-with-GurumNetworks-GurumDDS.rst
	modified:   source/Installation/Testing.rst
	deleted:    source/Installation/Ubuntu-Install-Debians.rst
	modified:   source/The-ROS2-Project/Contributing/Build-Farms.rst
	modified:   source/The-ROS2-Project/Contributing/Developer-Guide.rst
	modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst
	modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Installation-MacOS.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Installation-Windows.rst
	modified:   source/Tutorials/Beginner-CLI-Tools/Configuring-ROS2-Environment.rst
	modified:   source/Tutorials/Beginner-CLI-Tools/Launching-Multiple-Nodes/Launching-Multiple-Nodes.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst
	modified:   source/Tutorials/Demos/dummy-robot-demo.rst
	modified:   source/Tutorials/Miscellaneous/Building-Realtime-rt_preempt-kernel-for-ROS-2.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Installation/Ubuntu-Install-Debs.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

github-actions bot commented Aug 22, 2024

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/10503709301/artifacts/1841015501.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-4670/index.html in your favorite browser

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde merged commit d65a96d into jazzy Aug 22, 2024
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-4669 branch August 22, 2024 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants